umurmur: move config file to its default location

This was changed in version 0.3.1 [1]

Fixes initial start of umurmur:
```
root@turris:~# umurmurd
Error in config file /etc/umurmur/umurmur.conf line 0: file I/O error
```

And also while running help of umurmurd, the defailt location is /etc/umurmur/umurmur.conf
```
Usage: umurmurd [-d] [-r] [-h] [-p <pidfile>] [-t] [-c <conf file>] [-a <addr>] [-b <port>]
       -c <conf file> - Specify configuration file (default /etc/umurmur/umurmur.conf)
```
[1] https://github.com/umurmur/umurmur/commit/4f3ed41357bb6fcb7afddd5343b59cfef54d65a4

Fixes: c4a23ca99662e67c8b6f5b8bad76d93fc2381ea0 ("umurmur: update to version 0.3.1")
Signed-off-by: Josef Schlehofer <[email protected]>

diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile
index ff25fe10b660cf53ef65491f8fc056f4c9e116c1..85c64ac823fb7d9a3700d3f62099499c942da5f0 100644 (file)
--- a/net/umurmur/Makefile
+++ b/net/umurmur/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur
 PKG_VERSION:=0.3.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/v$(PKG_VERSION)?
@@ -59,7 +59,7 @@ define Package/umurmur-mbedtls/description
 endef
 
 define Package/umurmur-openssl/conffiles
-/etc/umurmur.conf
+/etc/umurmur/umurmur.conf
 endef
 
 Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles)
@@ -67,11 +67,10 @@ Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles)
 define Package/umurmur-openssl/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/umurmurd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/umurmur/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/umurmur/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
-       $(INSTALL_DIR) $(1)/etc/umurmur
 endef
 
 Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install)